From 592ff3d251777888e059d8803957891efeec07e5 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 7 Nov 2006 11:20:32 +0000 Subject: [PATCH] (get_server_config) [WINDOWSNT]: Search the server file on APPDATA if it doesn't exist on HOME, even if HOME is defined. --- lib-src/emacsclient.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 76ed21b29f8..3c3b27374fc 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -449,16 +449,21 @@ get_server_config (server, authentication) else { char *home = getenv ("HOME"); -#ifdef WINDOWSNT - if (! home) - home = getenv ("APPDATA"); -#endif + if (home) { char *path = alloca (32 + strlen (home) + strlen (server_file)); sprintf (path, "%s/.emacs.d/server/%s", home, server_file); config = fopen (path, "rb"); } +#ifdef WINDOWSNT + if (!config && (home = getenv ("APPDATA"))) + { + char *path = alloca (32 + strlen (home) + strlen (server_file)); + sprintf (path, "%s/.emacs.d/server/%s", home, server_file); + config = fopen (path, "rb"); + } +#endif } if (! config) -- 2.30.2